New upstream release

* New upstream release
* fix-new-test-cases.patch in upstream
* part of more_clear_man_c_option.patch is in upstream
  the rest is in install-data-file-to-meet-need-of-multi-arch.path

diff --git a/debian/changelog b/debian/changelog
index d7eecde479f52fa018983ac206fb7396a8f39209..f4a4873d1ba320469f38ca74e59c277e8ae166fa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+opencc (0.4.0-1) experimental; urgency=low
+
+  * New upstream release
+  * fix-new-test-cases.patch in upstream
+  * part of more_clear_man_c_option.patch is in upstream
+    the rest is in install-data-file-to-meet-need-of-multi-arch.path
+
+ -- Asias He <asias@debian.org>  Fri, 05 Apr 2013 10:52:29 +0800
+
 opencc (0.3.0-3) unstable; urgency=low
 
   * Rebuild to 

diff --git a/debian/control b/debian/control
index a3307373d57bdce4680949d624df288b7f9d4ea6..64cc292bed6c85a33b29743bfeb1f9b9edc3debd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: opencc
 Priority: optional
 Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org> 
-Uploaders: LI Daobing <lidaobing@debian.org>, Asias He <asias.hejun@gmail.com>,
+Uploaders: LI Daobing <lidaobing@debian.org>, Asias He <asias@debian.org>,
                YunQiang Su <wzssyqa@gmail.com>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1~), cmake
 Standards-Version: 3.9.3

diff --git a/debian/patches/fix-new-test-cases.patch b/debian/patches/fix-new-test-cases.patch
deleted file mode 100644 (file)
index 5d9339e..0000000
--- a/debian/patches/fix-new-test-cases.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Fix new test cases, install data file to meet need of multi-arch
- Copy nedded dict files to ${PROJECT_BINARY_DIR}/data for tests.
- Install data files to ${DIR_LIBRARY} instead of ${DIR_SHARE}
-Author: Kan-Ru Chen <koster@debian.org>, YunQiang Su <wzssyqa@gmail.com>
-
-Index: opencc/data/CMakeLists.txt
-===================================================================
---- opencc.orig/data/CMakeLists.txt    2012-03-29 01:56:20.043932047 +0800
-+++ opencc/data/CMakeLists.txt 2012-03-29 03:16:12.183694991 +0800
-@@ -92,4 +92,10 @@
-               ${CHINA_DICT_FILES}
-       DESTINATION
-               ${DIR_SHARE_OPENCC}
--)
-\ No newline at end of file
-+)
-+
-+if (BUILD_TESTING)
-+      foreach (DICT ${TAIWAN_DICT_FILES} ${CHINA_DICT_FILES})
-+              configure_file(${DICT} ${PROJECT_BINARY_DIR}/data COPYONLY)
-+      endforeach (DICT)
-+endif (BUILD_TESTING)
-Index: opencc/CMakeLists.txt
-===================================================================
---- opencc.orig/CMakeLists.txt 2012-03-29 01:56:20.043932047 +0800
-+++ opencc/CMakeLists.txt      2012-03-29 03:16:34.919807728 +0800
-@@ -20,6 +20,7 @@
- cmake_minimum_required(VERSION 2.8)
- set (PACKAGE_NAME opencc)
- project (${PACKAGE_NAME} C)
-+include (CTest)
- enable_testing()
- 
- ######## Package information
-@@ -86,7 +87,7 @@
-       set (DIR_ETC ${SYSCONF_INSTALL_DIR})
- endif (DEFINED SYSCONF_INSTALL_DIR)
- 
--set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
-+set (DIR_SHARE_OPENCC ${DIR_LIBRARY}/opencc)
- set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
- 
- ######## Configuration

diff --git a/debian/patches/install-data-file-to-meet-need-of-multi-arch b/debian/patches/install-data-file-to-meet-need-of-multi-arch
new file mode 100644 (file)
index 0000000..3f83f08
--- /dev/null
+++ b/debian/patches/install-data-file-to-meet-need-of-multi-arch
@@ -0,0 +1,15 @@
+Description: install data file to meet the need of multi-arch
+ Install data files to ${DIR_LIBRARY} instead of ${DIR_SHARE}
+Author: Asias He <asias@debian.org>
+---
+--- opencc-0.4.0.orig/CMakeLists.txt
++++ opencc-0.4.0/CMakeLists.txt
+@@ -95,7 +95,7 @@ if (DEFINED SYSCONF_INSTALL_DIR)
+       set (DIR_ETC ${SYSCONF_INSTALL_DIR})
+ endif (DEFINED SYSCONF_INSTALL_DIR)
+ 
+-set (DIR_SHARE_OPENCC ${DIR_SHARE}/opencc)
++set (DIR_SHARE_OPENCC ${DIR_LIBRARY}/opencc)
+ set (DIR_SHARE_LOCALE ${DIR_SHARE}/locale)
+ 
+ ######## Configuration

diff --git a/debian/patches/more_clear_man_c_option.patch b/debian/patches/more_clear_man_c_option.patch
deleted file mode 100644 (file)
index 06005ff..0000000
--- a/debian/patches/more_clear_man_c_option.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Clear the path of config_file /usr/bin/opencc
- Give out the path of config_file: /usr/lib/${DEB_HOST_MULTIARCH}/opencc/*.ini
-Author: Kan-Ru Chen <koster@debian.org>, YunQiang Su <wzssyqa@gmail.com>
-
-Index: opencc/doc/opencc.1
-===================================================================
---- opencc.orig/doc/opencc.1   2012-03-29 04:35:59.000000000 +0800
-+++ opencc/doc/opencc.1        2012-03-29 04:38:50.720283041 +0800
-@@ -16,6 +16,11 @@
- \fB\-c\fR
- Load dictionary configuration from config_file.
- .IP
-+Package libopencc1 has some configuration file preset: /usr/lib/${DEB_HOST_MULTIARCH}/opencc/*.ini;
-+the ${DEB_HOST_MULTIARCH} is something like "x86_64-linux-gnu" (AMD64)
-+or "i386-linux-gnu" (i386), or something else;
-+you can get it by `dpkg-architecture \-qDEB_HOST_MULTIARCH`.
-+.IP
- Note:
- .IP
- Text from standard input will be read if input_file is not set and will be written to standard output if output_file is not set.

diff --git a/debian/patches/series b/debian/patches/series
index 58ca48e1dd4a3d60ee49a105abb2fe353de8be39..c6810a575160779ca15b95f49441f0b8cbb49a8e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-
-more_clear_man_c_option.patch
-fix-new-test-cases.patch
+install-data-file-to-meet-need-of-multi-arch